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

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

Change-Id: I6f9e5bb2a7614ade93c9cbca8a3ac54c3bd3cd15