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

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

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