Merge "p2p: control debugging log with wifi verbose log"