Merge "Add setQuicOptions test" am: 023019600a am: 723198ddc5

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

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