Did the First Estate include the French nobility?

No. The First Estate consisted only of the Catholic Clergy, and the Second Estate was made up of the nobles. There was however a defenite cross over between the two Estates because French Bishops were all chosen by the King and most of the top ranking members of the Catholic Church were also members of the Nobility.