Merge "Wifi: Do not set auto_join in connect/wpas_p2p_connect()"