Reconcile code differences between google3 and Chromium QUIC code

Merge internal change: 237333593

R=rch@chromium.org

Change-Id: I2422795d690996cd6a56ce6c0091414a5bebd7d1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1510084
Commit-Queue: Victor Vasiliev <vasilvv@chromium.org>
Reviewed-by: Ryan Hamilton <rch@chromium.org>
Cr-Commit-Position: refs/heads/master@{#638966}
12 files changed