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

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

Change-Id: Ic9e69000eb4802f7bef1801762ae3d6d4d0acafa