Merge "Allow for dismissing resumable players" into rvc-qpr-dev am: 8d8c8aaf am: f69c09e9

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

Change-Id: I100ba2783af20f8737e4d7923c66330416a3b4b0