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