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