This change removes lock recursions and adds thread annotations. Bug: webrtc:11567 Change-Id: If6c86adddf006367eefedf10cce819e776e6afc2 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/175111 Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#31294}