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