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