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