Merge "Fix issue where player wouldn't expire" into rvc-dev am: 475cf18309 am: 2ef3210f10 am: 5680454d2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11887489 Change-Id: I06e725354e5f3e1a92686beb48acaf4bb23274e8
This commit is contained in: