The intent action in the manifest didn't match what was specified in account
authenticator preference
Bug: 8359559
Change-Id: Ic4c95ac954913d0cb5531cebcdddddded14ac1b2
* Restore Imap1 code
* Legacy users will use Imap1
* Existing Imap2 users will continue to use Imap2
* New accounts will be created in Imap1
* More to follow
Bug: 7203993
Change-Id: I8b86fcada59a854fd464d5269c94d00ebae85459