am 235dc89e: am 436d1e84: am adddfc48: P2P: Fix p2p_cancel processing during group formation

* commit '235dc89ebadbb56719e6cec838a49c3aa07b2d1b':
  P2P: Fix p2p_cancel processing during group formation