qcacld-3.0: Add dfs channel to ACS chan selection list

Single SAP is not allowed on the DFS channel with the
g_sta_sap_scc_on_dfs_chan value = 1.
If g_sta_sap_scc_on_dfs_chan = 1 and STA is present on the
dfs channel, allow the dfs channel to be added to ACS channel
selection list.

Change-Id: I19f799628febd495302547a3f223e8b2561d8b78
CRs-Fixed: 3271710

core/sap/src/sap_ch_select.c

@@ -468,7 +468,10 @@ static bool sap_chan_sel_init(mac_handle_t mac_handle,
 		}
 
 		if (!include_dfs_ch ||
-		    sta_sap_scc_on_dfs_chnl_config_value == 1) {
+		    (sta_sap_scc_on_dfs_chnl_config_value ==
+				PM_STA_SAP_ON_DFS_MASTER_MODE_DISABLED &&
+		     !policy_mgr_is_sta_sap_scc(mac->psoc,
+						pSpectCh->chan_freq))) {
 			if (wlan_reg_is_dfs_for_freq(mac->pdev,
 						     pSpectCh->chan_freq)) {
 				sap_debug("DFS Ch %d not considered for ACS. include_dfs_ch %u, sta_sap_scc_on_dfs_chnl_config_value %d",