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

Change-Id: I67f82525b5c0fa5b81235311988c9b186d16077a