Merge "p2p: add annotation for WifiP2pManager public API"