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