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

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

Change-Id: I23631e02d665d2b725a380645a7ec627785d14c5