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