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