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