Merge "surfaceflinger_fuzzer: Bug Fix" into main am: a01a2c2597 am: b4f064c130 am: 35acbd6527 am: f5b2a4d7c2 am: d57b28ad67

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

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