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

Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set title for dialog for a11y" into tm-dev am: f823b9a1 am: 9158943c am: cc9403e1

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



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