[automerger skipped] Merge "Remove wigig support from S tethering" into sc-dev am: 2e0cdad198 am: 3ede39228b -s ours
am skip reason: Merged-In Id0bf02c01419e0c69a1d0b6a41789826538444d3 with SHA-1 cc77000d9a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15142212
Change-Id: I1288c1a710d558378cb4cbc59f5f12773cd6c5f5
This commit is contained in: