Merge "wifi: Add p2p_supplicant.conf option"