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

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

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