Merge "Disable CtsNetTestCases if needed" am: 2c75c0444d

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

Change-Id: I3e3d8fde1970407f40657136d3a411008aaa99c0