Merge "Merge "media: fix race condition on async release" into rvc-dev am: 7e1b5589 am: fddc33a3 am: 66b09a3b" into rvc-qpr-dev-plus-aosp am: cc7c8630

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

Change-Id: I3462869bf8851045bc6efc70cadee4e6a205ad05