Merge "wpa_supplicant(hidl): Fix WPS method string" am: 2c3933c673
am: df4f38a6a2

Change-Id: I8f6a710620e70edeb140f468b5efcfcb16bbc2ce