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

Merge "Making the media carousel dismissable" into rvc-dev am: 82359e31 am: 7224fb89 am: 777a24b0 am: ee29de4b

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

Change-Id: If0afec6315674ecd1f48a0df3792a583f235a442