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

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

Change-Id: Ic0c3e34d344dc1dbc058ed776e024977872aa382