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

[automerger skipped] C2SurfaceSyncObj: prevent OOB read in Import am: 7470a6a1 am: bfa01566 -s ours am: a0457dfc -s ours

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

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



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