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

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

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



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