Merge "Fix CtsNetTestCases in instant mode" am: 81be2bd036

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

Change-Id: I84ec31354974c4913d6c4ac94a955054697180ff