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

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

Change-Id: If50e01ca1b92fb16d83529729a2bb670bb409ea7