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

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

Change-Id: I632524226be2159e81f8badf107fa2f0d3fe2f4b