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