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

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

Change-Id: I966668f0509d4796a5d9b1da500b20b02d619acd