Merge changes from topic "codec_importance" into main am: 6c2c6392

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



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