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