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