Merge "Add back tethering to TEST_MAPPING" into stage-aosp-master am: 74f74987bc am: 222231dc40

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

Change-Id: I1bf7aad8c2b7c39ea2129c7d606e3d5d0a1d63c2