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