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