Merge "Update ouput switcher panel height from 6.5 to 5.5 slice items" into...

Merge "Update ouput switcher panel height from 6.5 to 5.5 slice items" into rvc-dev am: 3e0102a3 am: 6dcf40e1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983922

Change-Id: I08fc52a201d3dc6897d0af5052424dcf76625d4c