[automerger skipped] Merge "Fix SurfaceFlinger crash caused by layerleak" into main am: c8ca54a am: cbec8f7 -s ours

am skip reason: Merged-In Ic6234567520fea06ed5af1b549ccc5b86461fec1 with SHA-1 3786b82 is already in history

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

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

Author: Melody Hsu