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