[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 -s ours am: 380c365a -s ours

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

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



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