split from the actual change for easier review and cherry-picking. BUG=webrtc:14605 Change-Id: I7dbaf8e1f4a03f35a5d8c4da1a2784b00589bfc3 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/280680 Commit-Queue: Philipp Hancke <phancke@microsoft.com> Reviewed-by: Jonas Oreland <jonaso@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/main@{#38519}