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

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

Change-Id: Ie8e5e1efe9e6076022358cd98267ee0c52d4c270