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: 243c50e4

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



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