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

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

Change-Id: I283c7e665673f148b447847ff1d96a2efa70f11c