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 am: 9dd278fb

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



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