Merge "WifiStateMachine: disable attempt to id gateway" into oc-dr1-dev am: c60208a6ff
am: 9f8effb730

Change-Id: I64ef149bc973c0655fbecf0c857ad4ba3fc057e2