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

Change-Id: Id99d972fa4d54a1f73ca11d9d1a8482fc35c9ea7