Merge "p2p: add frequency field in WifiP2pGroup"