Merge "softap: Add BAND_60GHZ to SoftApConfiguration"