Merge "[automerger skipped] Merge "Tethering: Add WiGig support" into rvc-dev...

Merge "[automerger skipped] Merge "Tethering: Add WiGig support" into rvc-dev am: 7852107b -s ours am: dabac5ec -s ours am: 8d5f6704 -s ours" into rvc-qpr-dev-plus-aosp am: 67cd7e04 -s ours

am skip reason: Change-Id Ic4d3aca0ed69234093af7f0206dab3335938c52a with SHA-1 04bef3c4 is in history

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

Change-Id: I022f18297d6034e40c3a88649ebb43d87bb6d446