Merge "Revert "Ringer mode button state a11y"" into udc-dev am: c6a789e7 am:...

Merge "Revert "Ringer mode button state a11y"" into udc-dev am: c6a789e7 am: ea20dd55 am: a8b581c7

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



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