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