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

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

Change-Id: Ic4732ef53ce4ab177ebb34ecc160684b582ebcd3