Revert "Email: Fix POP3/IMAP Account info lost after FOTA"

Renaming the account names for the EmailProvider causes a mismatch
with the AccountManager. This triggers the accounts to be deleted,
since they are now considered to be orphaned.

The only other reference to com.android.email.pop3 and
com.android.email.imap can be found in the Settings app via CAF
changes. Introduced in b3448db22da3772ca008ab3d40debb4acd4f5806 and
later removed in 0ab24a3860203857877a31febc90e623cbd96a07.

This reverts commit efe9ec3d3dea066d83ea3bc17bb3421274f5b432.

Issue: FP2N-304
Change-Id: I72a34b568d179bfd4503434622254ab61a48f016
3 files changed