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