[automerger skipped] Merge "Remove wigig support from S tethering" into sc-dev am: 2e0cdad198 -s ours

am skip reason: Merged-In Id0bf02c01419e0c69a1d0b6a41789826538444d3 with SHA-1 8f9705126a is already in history

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

Change-Id: I5ca9e9b5e8e01118f0d9bfa6c90b083d78c7f67a