Snap for 7977275 from 706f17d019a2c3ebb6b92d2d0fcd03a68371557c to sc-v2-release

Change-Id: I3ac3c0c60e3b07fe1572c5b47f22beece741c8f6
diff --git a/wpa_supplicant/hidl/1.4/supplicant.cpp b/wpa_supplicant/hidl/1.4/supplicant.cpp
index 6f4cde6..741a537 100644
--- a/wpa_supplicant/hidl/1.4/supplicant.cpp
+++ b/wpa_supplicant/hidl/1.4/supplicant.cpp
@@ -352,6 +352,10 @@
 		if (!wpa_s) {
 			return {{SupplicantStatusCode::FAILURE_UNKNOWN, ""}, {}};
 		}
+		//Request the current scan results from the driver and updates
+		//the local BSS list wpa_s->bss. This is to avoid a full scan
+		//while processing the connect request on newly created interface.
+		wpa_supplicant_update_scan_results(wpa_s);
 	}
 	// The supplicant core creates a corresponding hidl object via
 	// HidlManager when |wpa_supplicant_add_iface| is called.
diff --git a/wpa_supplicant/hidl/1.4/supplicant.h b/wpa_supplicant/hidl/1.4/supplicant.h
index 2944c50..c2b172c 100644
--- a/wpa_supplicant/hidl/1.4/supplicant.h
+++ b/wpa_supplicant/hidl/1.4/supplicant.h
@@ -23,6 +23,7 @@
 #include "utils/includes.h"
 #include "utils/wpa_debug.h"
 #include "wpa_supplicant_i.h"
+#include "scan.h"
 }
 
 namespace android {