Merge "Fix issue where player wouldn't expire" into rvc-dev am: 475cf183 am:...

Merge "Fix issue where player wouldn't expire" into rvc-dev am: 475cf183 am: 532eb3a9 am: 646c9ed6 am: 96cd4a95

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

Change-Id: I32c4b373200b23e7b18b1c789dc476d8a6aa5691