[automerger skipped] Merge "SurfaceFlinger: add more thread-safety annotations." am: be2ac15c am: df92275f am: 4612c829 -s ours am: 763ee291 -s ours

am skip reason: Merged-In Ib48433765bb6ffcb351ec10cd5bc89e254b48545 with SHA-1 194ff39d is already in history

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



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