Merge "Wifi: Add support of 6GHz band to NAN"