Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: 938a989c47" into nougat-mr1-cts-dev
am: 5997e170dd

Change-Id: Ia10e54a5e4afe88df0a4f0f18136ad67021f48cb