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

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

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