Merge "Add sdk_version property to cts tests" into main am: d6f447215f

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

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