Merge "Disable CtsNetTestCases if needed" am: 2c75c0444d am: d42bf9e53b am: 65a20ad635 am: 1233439894

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

Change-Id: I8edac36326135c0439f0595fbba6e493ddc73665