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: If7a8d499ef9ed32d802a0ab085e021ebfb3bc3a3