Merge "Don't use the hashCode from super in com.android.mail.providers.Account" into jb-ub-mail-ur10