Merge branch dev/FP2N-265 into int/n/fp2

* dev/FP2N-265:
  Wifi stops periodic rescans and disconnects

Change-Id: I10c359a9beab16aad77a9f143a5ecbe384790c79
diff --git a/wifi/WCNSS_qcom_cfg.ini b/wifi/WCNSS_qcom_cfg.ini
index c6ef398..ceafbef 100644
--- a/wifi/WCNSS_qcom_cfg.ini
+++ b/wifi/WCNSS_qcom_cfg.ini
@@ -391,6 +391,17 @@
 #Enable mac spoofing for firmware scans only (disabled in host scans)
 gEnableMacAddrSpoof=2
 
+# Scan Timing Parameters
+ gPassiveMaxChannelTime=110
+ gPassiveMinChannelTime=60
+ gActiveMaxChannelTime=40
+ gActiveMinChannelTime=20
+ gRoamIntraBand=0
+ gEnableMCCMode = 1;
+ gEnableFastRoamInConcurrency=1
+ gEnableEXTScan=1
+ gScanAgingTime=0
+ gChannelBondingMode24GHz=1
 END
 
 # Note: Configuration parser would not read anything past the END marker