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: f3d13e90 am: 2f5e0073

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

Change-Id: I5d0c0fe7e1f17ade449cd3dc8dd0268b8c14123f