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: ea2cb83e am: d493e5b5

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



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