Merge "P2P: Add OuiKeyedData for P2P connect and group event callbacks." into main