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

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

Change-Id: Ie4937d0a9dc0c0e3c221b36020f939df06f35675