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

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

Change-Id: I876014f6c9cb805595afbfa79aaf0d5945177ebe