Merge "Disable CtsNetTestCases if needed" am: 2c75c0444d am: d42bf9e53b

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

Change-Id: Iccc7f22c470cbc5c38b156c60452659d982309b2