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

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



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