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