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