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