Merge "nl80211: Do not reset vendor_scan_cookie after scan timeout" into wlan-aosp-service.lnx.2.0-dev