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

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



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