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

Change-Id: I30591519ca25c622df7ef38d07bc0b5970392e92