merge_pr_30054
BUG=chromium:1240649,webrtc:11640 Change-Id: I9a0abeec057c64a17ce0f681664ae4c7c46eb706 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3100128 Reviewed-by: Johannes Kron <[email protected]> Reviewed-by: Ilya Nikolaevskiy <[email protected]> Commit-Queue: Philipp Hancke <[email protected]> Cr-Commit-Position: refs/heads/master@{#912633}