Merge "resourcemanager: fix reclaim issue with conflicting codecs" into main...

Merge "resourcemanager: fix reclaim issue with conflicting codecs" into main am: 21c7f857 am: cbd81ec2

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



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