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