Merge "Add more necessary infra to CSTest" into main am: 21599869f7

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

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