This ports:
https://chromium-review.googlesource.com/c/544798/

This is needed to unblock rolling build into v8 at:
https://chromium-review.googlesource.com/c/v8/v8/+/657634

Bug: chromium:593874, chromium:742655
Change-Id: Ie00f2d13cfd052881a84b6e0cb95c336b7d2581c
Reviewed-on: https://chromium-review.googlesource.com/680815
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#48134}