[automerger skipped] Merge "NdkMedia: fix...

[automerger skipped] Merge "NdkMedia: fix android.mediav2.cts.CodecEncoderSurfaceTest failed." into rvc-dev am: c1b100f2 am: aaefdfe7 am: afa248f3 am: d21b39a7 am: cd02fa76 am: 7fe9a14a am: 97cda45c am: f8100767 -s ours

am skip reason: Merged-In I76ef2c404f8264843973e1af9be1b23fc1e6c3af with SHA-1 184293b5 is already in history

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



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