[automerger skipped] Merge changes from topic "refactor-hideInSettingsInQuietMode-udc-mainline-prod" into udc-mainline-prod am: b92caa92 -s ours

am skip reason: Merged-In I4a8247c8442651fc01d5a948dad2e1068abc75de with SHA-1 c1614604 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25511426



Change-Id: Icbe626b533dda46c430b7a50bea5b3675a558022
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>