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