am 0b572896: (-s ours) Merge "DO NOT MERGE refactor wifi p2p\'s startDhcpServer function"

* commit '0b57289678a4dc82fefa4894901af1be7f5cc3c6':
  DO NOT MERGE refactor wifi p2p's startDhcpServer function