Revert "p2p: Fix for discovery failure until AP is connected in WFD client"

This reverts commit 738434a7df1cf7d0aada02e7905bdb4a51b5d3d6.

Change-Id: I4c1f061aa26077134029527dfc3e55112fed5038
CRs-Fixed: 532138