Merge "Revert "Revert "Revert "Ringer mode button state a11y"""" into udc-dev...

Merge "Revert "Revert "Revert "Ringer mode button state a11y"""" into udc-dev am: c8d3d7a5 am: 4ee17647 am: b2723da8

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



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