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

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

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