codec2: fix to encode smpte2094-40 for gralloc4 metadata am: 3f3d1ace57 am: eb6c45a526

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

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