Merge "Reduce height of expanded media controls" into sc-dev am: 30a5f7a8 am: 1b47d90b

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

Change-Id: Ie3b8281873cfca08534bbdad2c94be536682f959