[automerger skipped] C2SurfaceSyncObj: prevent OOB read in Import am:...

[automerger skipped] C2SurfaceSyncObj: prevent OOB read in Import am: 9c80c519 -s ours am: 089bd421 -s ours am: f39edb8e -s ours am: 73ccc67d -s ours am: ad78ae1f -s ours

am skip reason: Merged-In I7b4cd8aa3fa5b9b2160f0eba40a618b4dd536d5c with SHA-1 7470a6a1 is already in history

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



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