Merge "Update TetheringTests for new connectivity shims" am: 86b39c8c34

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

Change-Id: I56d689d76d6fbf9ee318f63674fdef8bf1021d91