Merge "[Output Switcher] UI polish and A11y bug fix" into udc-dev am: 4adfb70d am: 2e814244

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



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