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

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

Change-Id: I432917200f5e8ed88a5eab89deee96f31e79f050