Merge "Wifi: Add 6GHz bands to WifiBand"