[automerger skipped] Merge "Update TetheringTests for new connectivity shims" am: 86b39c8c34 am: 7d70169cee -s ours

am skip reason: Merged-In Ibc04e64a1e9d82b67aff10d1a6d77f9e6b1bbdfb with SHA-1 c94a1ffd55 is already in history

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

Change-Id: I293a611499d6441a958fce9d8371856dce91d0df