Merge "Making the media carousel dismissable" into rvc-dev am: 82359e31 am: 2001debc am: fbb63aee

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

Change-Id: I87d5d216a11255589cd1f162a5c2da1f04a4cb5c