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