Do a clean shutdown of p2p

We were doing a lazy shutdown and stopping supplicant behind p2p's back.
Make sure we stop p2p, before we go ahead with shutting down.

Bug: 7368832
Change-Id: I941e9cd69d6f27532207d3dc00b03c55c0e6335c