Improve Autofill heuristic terms (#674)

Add "e-mail" and "login" as username terms and sort the lists.

Co-authored-by: Harsh Shandilya <msfjarvis@gmail.com>

app/src/main/java/com/zeapo/pwdstore/autofill/oreo/FormField.kt

@@ -80,10 +80,10 @@ class FormField(
             "search", "find", "captcha"
         )
         private val PASSWORD_HEURISTIC_TERMS = listOf(
-            "pass", "pwd", "pswd"
+            "pass", "pswd", "pwd"
         )
         private val USERNAME_HEURISTIC_TERMS = listOf(
-            "user", "name", "email"
+            "e-mail", "email", "login", "name", "user"
         )
     }