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

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



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