Merge "wifi: Add a new property to indicate active wifi iface" am: 849ac8020d
am: 09b3e95f62

Change-Id: I9aede4d79b1bb1a58a6a0a7f12ec716dee36c3a9