Merge "resourcemanager: map right codec type for metrics" into main am: a188d5ae

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



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