GitLab

Re-lands https://chromium-review.googlesource.com/1033019 after
fixes to downstream changes.

Bug: 810904
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: I0b168ae145999d3269d910b77c6a770d86fb8ee0
Reviewed-on: https://chromium-review.googlesource.com/1034028Reviewed-by: Peter Lee <pkl@chromium.org>
Commit-Queue: Daniel Blakemore <danblakemore@google.com>
Cr-Commit-Position: refs/heads/master@{#554818}