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