Merge "Wifi: Add support to query and use driver advertised interface combination" into udc-dev