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