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

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

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