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