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

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

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

Change-Id: I030012bddc6e8701ad073ce2eef9f794a97dd7b5