Merge "SurfaceFlinger: add more thread-safety annotations." into udc-dev am:...

Merge "SurfaceFlinger: add more thread-safety annotations." into udc-dev am: b82f5ddf am: f7645da0

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



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