Merge "WifiManager: add unspecified ip mode" am: dae92faa02 am: 0b9fa27619
am: 610a0db7a2  -s ours

Change-Id: I2ca161f16ec04a12f4bae55ca7ee7a31558d51fb