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: 473237f9 am: a00c4049

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

Change-Id: I8a6c5bd3df0809d88cded9b8ace8fcab256a7841