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