Merge "Fix issue where player would not be dismissed" into rvc-dev am: f51a9a0c am: fba8e08d

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

Change-Id: I5a0f2d514367c4321d6abd4861cc3184363c6c4f