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

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

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