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

[automerger skipped] Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Make either transfer or expansion on a single route" into tm-dev am: 72fbb775 am: d2f20499 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iffe3173bdab35ec32a17f0f7c54cd82dcb77bd19