Merge "media: further resource cleanup for async release" into rvc-dev am: 275248ddfe am: 30ffcd3b58 am: d66b98eadc

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

Change-Id: Iab973956445f28e8ac1a78ffd11c72cf81d0b16b