[automerger skipped] Merge "Update Config Mapper for AV1 encoder" into udc-dev...

[automerger skipped] Merge "Update Config Mapper for AV1 encoder" into udc-dev am: 52f25681 am: c96f68d8 -s ours

am skip reason: Merged-In I288f9d6f64ca14cd29659824eb9f3e2120d279ff with SHA-1 89d8d40f is already in history

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



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