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: 08991f69

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



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