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