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