Revert "remove email opt out from account settings management"
Revert "remove email opt out from account settings management"

This reverts commit c34c2567195d249057c866bf855e08174f651a95.

Conflicts:
	corehq/apps/users/forms.py

dimagi/commcare-hq,puttarajubr/commcare-hq,qedsoftware/commcare-hq,qedsoftware/commcare-hq,dimagi/commcare-hq,qedsoftware/commcare-hq,puttarajubr/commcare-hq,dimagi/commcare-hq,puttarajubr/commcare-hq,qedsoftware/commcare-hq,dimagi/commcare-hq,puttarajubr/commcare-hq,qedsoftware/commcare-hq,dimagi/commcare-hq