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

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

Change-Id: I8921e9c4ed223cf4a4f1cca1b3e9f0eece7a9da5