Merge "Fix SurfaceFlinger crash caused by layerleak" into main am: c8ca54a3fa

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

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