Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: 938a989c47" into nougat-mr1-cts-dev am: 5997e170dd" into oreo-cts-dev
am: 1f5dd74fe1

Change-Id: I8e5b8c75031102cdd14605d336028ab3dbfa7e9c