Revert "Revert "wifi: forward port avoid poor connection setting""

This reverts commit dc0ea8075466308422fbd8217abdfde3e9b020a1.

Change-Id: I86692242e97cc1a94ed407ac69f4911252f92cd8