[automerger skipped] Merge "resourcemanager: move common code into different...

[automerger skipped] Merge "resourcemanager: move common code into different source." into main am: 5ea9732f am: 893c649d am: fe795dc9 -s ours

am skip reason: Merged-In I70f4776979104f1468e2791bb8e977ab85d9676a with SHA-1 224fc63e is already in history

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



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