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: I09c993d24d1eee4fb001d4b14c1e445612876acb