Merge "Remove wigig support from S tethering" am: 0b44491744 am: 8027e83cf1

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

Change-Id: I3b70145c2609cab9222f30ef3a3d5d40bc8ef4a7