[automerger skipped] Merge "Tethering: Add WiGig support" into rvc-dev am: 7852107b29 am: 96a0513a90 -s ours

am skip reason: Change-Id Ic4d3aca0ed69234093af7f0206dab3335938c52a with SHA-1 6896f6193f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953638

Change-Id: I02ca5d4528ad443c6498c9d5b14adfa850cbd42f
tree: 22fca3fce1c22941e9cf7f0d60f1450549edd900
  1. Tethering/