Merge "Skip tests in CtsNetTestCases module if feature not supported" into main am: cae5209d5a am: 22064b0269 am: 0ec55a7e0f

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

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