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: 46bc5d07

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

Change-Id: I6d09bc03949f40b01d29b6934ca975159105d1ed