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

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

Change-Id: I01567acf73c00836e9b3d3d23a63750fc14e9b60