Merge "add congestion control test to CTS" am: be66108f84 am: adc70718fe

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

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