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

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

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

Change-Id: Id88a87186ecbd5aecde7a3cbdfb205c7a6a001c4