Merge "Wifi: Update AP Bands to include 6GHz"