Merge "Output Switcher shows "+" button next to some non-expandable device"...

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

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

Change-Id: I8168d0a5c9328b2b24938a3226ec9685303264e7