Merge "[Output Switcher] Adjust device list height" into tm-dev am: bc000778...

Merge "[Output Switcher] Adjust device list height" into tm-dev am: bc000778 am: ca565150 am: 5dd2a73c

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



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