Merge "Enhance wifi p2p module state machine log" into udc-dev