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

Merge "Reduce height of expanded media controls" into sc-dev am: 30a5f7a8 am: d49e52c4 am: f49cef3a am: 8cf6a205

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

Change-Id: Iebbb077bf7caa8fc5d3be90705a4ae9c3723ed47