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 am: 15a78531 am: c943f46b

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

Change-Id: If74fd050dd8e228d63ce455f26e37d87971f7dd5