[automerger skipped] Fix CtsNetTestCases in instant mode am: 21e5140ff4 am: 48a0dbefbd -s ours

am skip reason: Merged-In I7a7b0169a3a495bb359dc1f72e56937dcdc5b8a8 with SHA-1 21e5140ff4 is already in history

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

Change-Id: I75e11ba2086e6808b2fee2d40c5780e464ab4055