GitLab

Contains only cl/342372120 since the last uprev. This addresses a
possible keep alive time-out when doing larger file transfers due to the
crypto context mutex being held for longer than necessary.

Bug: 1146293
Change-Id: If6e51f936faf10756c122b7d9676ddc606ab7e60
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2543196
Auto-Submit: James Vecore <vecore@google.com>
Commit-Queue: Josh Nohle <nohle@chromium.org>
Reviewed-by: Josh Nohle <nohle@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828186}