Keep p2p and sta config seperate to avoid conflicts. Bug: 5002384 Change-Id: I8f8fc5f984f4f91f9ece4012bf536daa5cc00bba