Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684389 Change-Id: Ieba054b1692260cee393b2b18554de4fe31df46f Ignore-AOSP-First: this is an automerge Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>