[automerger skipped] [automerge] C2SurfaceSyncObj: prevent OOB read in Import 2p: e3958886db am: 8297258e63 -s ours am: ddcfad94d7 -s ours am: 210fa35f0a -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/+/20758528

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