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

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

Change-Id: I654fc16f23957f0c23585dceb15d9ee470ddb765