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