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

Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Decouple selection behavior code" into udc-dev am: 53035a00

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



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