Merge "wpa_supplicant(hidl): Fix WPS method string"