[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 am: ea9ca47b am: 6ec9ace4 -s ours am: 7f212970 -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: I43304f5f929d5571cb84f0c7eea6950631c3f112
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>