[automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: c6dd9a3e54 am: 9132faed33 am: 3d29223c93 am: d702099a52 am: ef295eafa2

Change-Id: I4a5a31dfb9e894afc352b082e344b17b4e3209c2