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

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



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