[automerger skipped] DO NOT MERGE: Downbranch merge conflict [Output Switcher] Make either transfer or expansion on a single route am: 6da04ce0 am: e5879232 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ic8619a7d2fe2ad4f191503ff22fe5ccecb5b774d