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