[automerger] Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly...
[automerger] Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: 938a989c" into nougat-mr1-cts-dev am: 5997e170 am: eb0bcc03
Change-Id: I563f32e1d0f14c80a9dac8b3bf74d8fd80589f4d