Allow P2P functionality to be disabled on non p2p interface

Change-Id: Ibfbd92c1195fc799c85b9ecbb483bbd3134b74af