This CL is a pure move; later CLs will try to increase consistency between the functions. Bug: webrtc:360058654 Change-Id: I6662b3d35f8e2dab60c2778a4755454fe3029fe2 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/365100 Commit-Queue: Harald Alvestrand <hta@webrtc.org> Reviewed-by: Florent Castelli <orphis@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43210}