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

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



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