Merge "codec2: enc stat: add mapper for picture_type_t" am: f2f591ed am:...

Merge "codec2: enc stat: add mapper for picture_type_t" am: f2f591ed am: 687ecc3c am: 3bce0c4b am: 74ac514a

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



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