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

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



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