This change removes lock recursions and adds thread annotations. Bug: webrtc:11567 Change-Id: Idc872bda693776667f3b9126bd79589d74398b34 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/175640 Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> Commit-Queue: Markus Handell <handellm@webrtc.org> Cr-Commit-Position: refs/heads/master@{#31308}