This change removes lock recursions and adds thread annotations. Bug: webrtc:11567 Change-Id: I984a0b7993b03c039c220206e2a930ff766e54b0 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/175125 Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Commit-Queue: Markus Handell <handellm@webrtc.org> Cr-Commit-Position: refs/heads/master@{#31323}