Merge "Making the media carousel dismissable" into rvc-dev am: 82359e319e

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

Change-Id: I9fb068c29db1a3767d8c1a7653e220f8e29326d3