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

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

Change-Id: I765ec53fa80bfabab9766605f53ae6294d889813