[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 am: 344f2a1d
Change-Id: I928e0f5ca9200c0b989e5315758de706bf8d2bba