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