[automerger skipped] Merge "DO NOT MERGE: Downbranch merge conflict [Output...

[automerger skipped] Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Behavior improvement" into tm-dev am: 8292f122 am: 417ceeb1 am: 7d0eabb8 am: 4e5861ef -s ours

am skip reason: subject contains skip directive

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



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