Merge "Fix media layout to avoid awkward expansion transitions." into sc-dev am: bc10cd12 am: 0d633981

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

Change-Id: I663e6eecd3ecbc89fb99b575ebbb6da949f8b3b4