Merge "media: fix race condition on async release" into rvc-dev am: 7e1b5589

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

Change-Id: I36e8e9dbdf38d88c43df76180d597561655a0d71