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

[automerger skipped] C2SurfaceSyncObj: prevent OOB read in Import am: 36e24c58 -s ours am: 1c0991b3 -s ours am: 065155ad -s ours am: d56ce816 -s ours

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

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



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