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