Merge "codec2: fix to encode smpte2094-40 for gralloc4 metadata" am:...

Merge "codec2: fix to encode smpte2094-40 for gralloc4 metadata" am: dec27c17 am: 39d1ff52 am: 8ffe616a

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



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