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

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

Change-Id: I0b15cd00cfafb919893cc79d752afd22c30e9dd8