Merge "Add CTS tests for QuicOptions" am: 6d9f7be7b3 am: b258de352e

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2465876

Change-Id: I64d22744a2792dd053c5d2ae1ec6e69469dc6434
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>