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