[automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45 am: ddfb743324 am: aa92791e8b am: d086c29189

Change-Id: I2c21749f6f896e382f7afdf913ab8a84f6723c2b