Merge "supplicant(interface): Add interface for WPS" am: 342658139f
am: 8499d6b3e0

Change-Id: I26a48d05041199d6e78d40881fb10fae12233980