am a17968fa: (-s ours) am d20107df: Merge "Add trivial retransmission of QUIC packets" into mnc-dev

* commit 'a17968facb7f52a6877ce36e69ab1aed36fa25ee':