fixup "wifi: forward port avoid poor connection setting"

Change-Id: I3545e874bd6519a586744fc36297f7f3f3cb1f42
Merge remote-tracking branch 'upstream/cm-12.0' into cm-12.0