Merge "[Output Switcher] Update device selection layout" into tm-qpr-dev am:...

Merge "[Output Switcher] Update device selection layout" into tm-qpr-dev am: 31b52d1b am: 23b5b5c8

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



Change-Id: Icc569a5f0eba2ddaf83b387eee2540a96009b825
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>