Merge "media: further resource cleanup for async release" into rvc-dev am:...

Merge "media: further resource cleanup for async release" into rvc-dev am: 275248dd am: 30ffcd3b am: d66b98ea am: a727514f

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

Change-Id: Icf2ddbf279004a342437e2661e8beb0f79f59e5f