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

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

Change-Id: I076593827131a1592a2efec203c6e7d39d0074d5