Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev
am: af4499cf45

Change-Id: I4036de2d4a1ccd190c559b95470fdab09cb948c0