Revert "Move Email to androidx." am: 1e74d335d8
am: 12b8a265fd

Change-Id: Ia156883714b376885499b5d7ba52c0154608ae4d