[automerger skipped] Merge "Update TetheringTests for new connectivity shims" am: 86b39c8c34 am: 7d70169cee -s ours am: 923b92412c -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: Iaf1bbce50ce7cc4b43886b4856b9d6a3513d44b3
This commit is contained in: