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