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: Ide9b353b43963c1ee126c27ffa1dbbb96eec46a8