Merge "Refactor wifi p2p's startDhcpServer function"