Merge "Add QUIC testing to test preparer" into main am: 323c15448a am: 27a1360441

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

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