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