I tried to land the same change by reverting https://webrtc-review.googlesource.com/c/src/+/34443 but the revert failed and I therefore land it manually here instead. TBR=glaznev@webrtc.org Bug: b/32742417 Change-Id: Ied8ed3e7c7d67c51f781e39cbea952a2303278d9 Reviewed-on: https://webrtc-review.googlesource.com/34442 Reviewed-by: Henrik Andreassson <henrika@webrtc.org> Commit-Queue: Henrik Andreassson <henrika@webrtc.org> Cr-Commit-Position: refs/heads/master@{#21351}