Merge "[Output Switcher] Update Ui layout to match with mertial next" into sc-v2-dev am: 152da31edf am: c8a67e2128

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

Change-Id: Ib851708d6ebc50fe0241661b5333dfe3e39ae928