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: 2ec2b6bd am: 4be974fb

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



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