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