Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Update...

Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Update property for A11y bugs" into tm-dev am: 44b000a2

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



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