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