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