Merge "Disable CtsNetTestCases if needed" am: 2c75c0444d

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

Change-Id: I1a25770e3a657174d70b644b1870b13e00db40c5