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

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

Change-Id: I3854251bb18d851b294c254de1664f0dab2d936c