[automerger skipped] Merge "codec2: enc stat: add mapper for picture_type_t"...

[automerger skipped] Merge "codec2: enc stat: add mapper for picture_type_t" into tm-dev am: a2ac684a -s ours am: eb9354eb -s ours am: f0c4b912 -s ours am: 270bc45a -s ours

am skip reason: Merged-In I855606e2b98b238d571d9b47d36db3f04e92ce06 with SHA-1 7c1a386a is already in history

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



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