This change removes lock recursions and adds thread annotations. Bug: webrtc:11567 Change-Id: I995cdc71b4e447e1153617b3d8472f35c1670181 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/176440 Reviewed-by: Henrik Andreassson <henrika@webrtc.org> Commit-Queue: Markus Handell <handellm@webrtc.org> Cr-Commit-Position: refs/heads/master@{#31426}