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