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

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



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