DO NOT MERGE: Downbranch merge conflict [Output Switcher] Update property for...

DO NOT MERGE: Downbranch merge conflict [Output Switcher] Update property for A11y bugs am: 529a0079

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



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