Merge "wlan: Copy WCNSS_cfg.dat from respective path based on WLAN_PROPRIETARY"