Merge "p2p: revise WifiP2pWfdInfo constants" into sc-dev