DO NOT MERGE: Downbranch merge conflict [Output Switcher] Decouple selection...

DO NOT MERGE: Downbranch merge conflict [Output Switcher] Decouple selection behavior code am: 6bd94730

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



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