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