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