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 am: 1b565b35

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



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