[automerger skipped] codec2: fix to encode smpte2094-40 for gralloc4 metadata...

[automerger skipped] codec2: fix to encode smpte2094-40 for gralloc4 metadata am: 3f3d1ace am: abc84372 -s ours

am skip reason: Merged-In I1847fd11d0de45673d6180df5040eb7f588f7a82 with SHA-1 3f3d1ace is already in history

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



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