A refactoring was lost after revision 3 of https://webrtc-review.googlesource.com/c/src/+/377122 due to an incorrect merging/cherry-picking. Reapplied it. Bug: webrtc:396373001 Change-Id: Ice7a8e94ad984cb308eb9cab83df2e9ecca3d53c Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/377283 Commit-Queue: Victor Boivie <boivie@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43912}