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

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

Change-Id: I3ce6b36801f6847dcff172b0430a7e3c5a7159e8