Merge "wifi: add an api to remove a P2P client"