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