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

Merge "[automerger skipped] codec2: fix to encode smpte2094-40 for gralloc4 metadata am: 3f3d1ace -s ours am: a85d7818 -s ours" into tm-d1-dev-plus-aosp am: e4e00d24 -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: I7a57a0d976d7a4bc5d325d02703cdd75f9332ded
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>