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

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

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

Change-Id: I8229cde71d65f86606d8f883c060f261281dd21d