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