Merge "resource_manager: fix cross-type reclaim" am: 5307c587 am: 972e3346...

Merge "resource_manager: fix cross-type reclaim" am: 5307c587 am: 972e3346 am: 8916c8fe am: f263d1be

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2029026



Change-Id: Ide7f9d49ec4a64266c2a813503984171e8239fca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>