Downstream projects have been updated, so this can now be relanded. This is a revert (and rebase) of: https://webrtc-review.googlesource.com/c/src/+/88820 Bug: none Change-Id: I424664ddef7aeebd3c6c94ae67c7f70a342dc9a4 Reviewed-on: https://webrtc-review.googlesource.com/92082 Reviewed-by: Niels Moller <nisse@webrtc.org> Reviewed-by: Åsa Persson <asapersson@webrtc.org> Commit-Queue: Philip Eliasson <philipel@webrtc.org> Cr-Commit-Position: refs/heads/master@{#24181}