Merge "Disable CtsNetTestCases if needed" am: 2c75c0444d am: 1f5c56406c

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

Change-Id: I729d1c47277e513613dcd2f123678428f8d1a799