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: 783bf63c am: fabc297f am: 8520611f

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



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