Merge "Output Switcher shows "+" button next to some non-expandable device" into sc-dev am: 5d85d8f3 am: 43c92c26

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

Change-Id: I231e2905b8aa77ed738662a3e7ff9cbc661195e7