Merge "Wifi: Add definitions for 6GHz" into rvc-dev am: 7ccfc086e4

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

Change-Id: I495c6439823a03bb6ffff5b27ae69e756297d573