Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898012 Change-Id: I94a6521cf1967c028faa657228cc909f2b1b3895 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>