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

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

Change-Id: Icdac8821b1a8c834078c25e02f358f3f435806ba