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