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