[automerger skipped] C2SurfaceSyncObj: prevent OOB read in Import am: 36e24c5819 -s ours am: 1c0991b35b -s ours am: 065155ad22 -s ours

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

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

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