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

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

Change-Id: I42948954e1b469f2d0751574db4c726e8ed76653