This allows the user to choose which type of authentication to use for existing IMAP accounts. Change-Id: Ib44364a1059a2c4b8a7a0fa66b14cd042b28770e