Merge "qcacld-3.0: Set neighbor scan channel max time to 40 msec as default" into wlan-cld3.driver.lnx.2.0