[automerger skipped] Merge "Tethering: Add WiGig support" into rvc-dev am: 7852107b -s ours am: dabac5ec -s ours

am skip reason: Change-Id Ic4d3aca0ed69234093af7f0206dab3335938c52a with SHA-1 6b4ea1d8 is in history

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

Change-Id: I1ce91e52fad77b3a546dedea8034cba442c618a4