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

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



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