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

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

Change-Id: Idff15894fb456e6b49d5db33555c776f4a10618b