Merge "p2p: fix incorrect connection type in wifi p2p metric dump"