Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Make either transfer or expansion on a single route" into tm-dev am: 72fbb77539
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17181447 Change-Id: Ied001555c38d0dea6b4af94ddb5db76a39b783da
This commit is contained in: