Merge "softap: Add band (2 + 5)G convert when convert to WifiConfiguration"