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

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

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