Merge "surfaceflinger_fuzzer: Bug Fix" into main am: a01a2c25 am: b4f064c1...

Merge "surfaceflinger_fuzzer: Bug Fix" into main am: a01a2c25 am: b4f064c1 am: 35acbd65 am: f5b2a4d7

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



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