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