[automerger] Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07 am: f515825b13 am: 0fc63b9a32 am: 44d2051887
am: 8ea6a7e0c3

Change-Id: Icb1949443bc2b7844c9487584320a68b55d0c9a4