Merge "WifiManager: add iface name and mode labels" am: 21cc4bcd am: 78deb691 am: ca2cec47 -s ours am: 9dcc04fe -s ours Change-Id: I30591519ca25c622df7ef38d07bc0b5970392e92