Merge "fix issue where players would be wrongly dismissed" into rvc-dev am:...

Merge "fix issue where players would be wrongly dismissed" into rvc-dev am: 7d985f79 am: 4a8ce781 am: 9ae6152f

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

Change-Id: I6d1c57baf9a02f7f12e2df508636bf09e2e9b42d