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