Merge "Wifi: Add definitions for 6GHz" into rvc-dev am: 7ccfc086e4 am: 4d8c041377 am: 41f8a8a0c2 am: b32887431f

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

Change-Id: I98e40ca102be6b8e688c3f5d6957942688488bdb