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