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 am: 0571228d

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



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