Merge "Update TetheringTests for new connectivity shims" into sc-dev am: b81724602f

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

Change-Id: I3827d12719ddc930a18e8651dd66a2e28b6f92f6