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

Change-Id: I72cb4f33460d38b5c3b249a47d0cf0dec3e8ab6e