Merge "surfaceflinger_fuzzer: Bug Fix" into main am: a01a2c2597 am: b4f064c130

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2700594

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