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