[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 am: 76744911 -s ours am: 5f02fe60 -s ours am: 76fd9da8 -s ours

am skip reason: Merged-In I76ef2c404f8264843973e1af9be1b23fc1e6c3af with SHA-1 95f411fb is already in history

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



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