Merge "resource_manager: fix cross-type reclaim" am: 5307c587cb

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

Change-Id: I5ff9132a0763973e6b31b2e94f849bd4b778037d
Signed-off-by: Automerger Merge Worker