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