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

Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Behavior improvement" into tm-dev am: 8292f122

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



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