[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
Change-Id: I66e6ccb18f222ae57609207e583805878afaa393