[automerger skipped] Merge "C2SurfaceSyncObj: prevent OOB read in Import" into...

[automerger skipped] Merge "C2SurfaceSyncObj: prevent OOB read in Import" into tm-qpr-dev am: 620318fb am: 9c65e9c4 -s ours

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

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



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