Merge "Fix issue where player would not be dismissed" into rvc-dev am: f51a9a0cf6 am: dbdcda8eb0 am: 20cb1f0184 am: 8f7cb0688a

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

Change-Id: I2ee1dbf91069289b86f22f860a777236ce233af4