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