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 am: 7afbf7f3

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



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