Merge "WifiManager: add iface name and mode labels" am: 21cc4bcd01 am: 78deb691cc
am: ca2cec4754  -s ours

Change-Id: I246ca7917e01ab70d8304a81c669d77c4641fa8d