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