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