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