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