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