Merge "NdkMedia: fix android.mediav2.cts.CodecEncoderSurfaceTest failed." into main am: 74cc2a0784 am: 7556f9fd97

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

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