Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922 Change-Id: I5c3133f66d3c0245b408946fdcbeffa9f4f91018 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>