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

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



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