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

Merge "Revert "Revert "Ringer mode button state a11y""" into udc-dev am: 66e2d492 am: 29aafd19 am: 68e43d4d am: 8e4715f6

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



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