Bug 1684333: Change gender identification question

To be more inclusive. This is an intermediate short-
term solution until we decide how best to remove
the question entirely without losing data or turning
it into a free form field.

behatnotneeded

Change-Id: If23b36f9b1ee0a112a8a40e41b6e2e3fa75a43bb
(cherry picked from commit d4a26e30)