Merge "WifiStateMachine: check for null config after dhcp" into oc-mr1-dev
am: 75dc8a494a

Change-Id: I83136bb7d49059424565d3cdb42ed3a81574338e