Merge "WifiManager: add iface name and mode labels" into oc-dev am: dfd185c62f
am: 3e737d1cf0

Change-Id: Ieff7af7c1ac2113b8044c16a01cad0f96cb70158