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