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