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: I76abd4518054a2fa8783c063709c4f7aef79a0f2