Merge "Revert "[BugFix][API-972]fix wpa_supplicant sometimes no event or msg return"" into GSW3.0-No-Connman