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