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