[automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less...
[automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: c6dd9a3e am: 9132faed am: 3d29223c
Change-Id: Ica6b9699d7c429d6f0d4088fb0a05b4ecf49e818