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