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

[automerger skipped] Merge "Tethering: Add WiGig support" into rvc-dev am: 7852107b am: 67d68b32 -s ours am: 17ab150e -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: I5b1f4d085dcca1e9a25a1530d9dac019b41dc88b