[automerger skipped] Merge "SF: Enforce thread safety for SurfaceFlinger...

[automerger skipped] Merge "SF: Enforce thread safety for SurfaceFlinger class" into rvc-dev am: b209e7b5 am: 3a8a7ddf -s ours

am skip reason: Change-Id Ibada81998d70c940c7406ef292b2d487fb02189d with SHA-1 a19f4b62 is in history

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

Change-Id: I5a40214eeb68fec1181acd8f8b7ed561aafd401b