Merge "p2p: add WifiP2pConfig builder for new API"