Merge "Add back tethering to TEST_MAPPING" into stage-aosp-master am: 74f74987bc am: 22e2abfd16 am: 9eeb0be292

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

Change-Id: I657e5f4d641f2f42f483e75f11d60a15a0a366b6