[Autofill] Include overall type in
the title of form elements when --show-autofill-type-predictions flag is set.

This includes any "autocomplete" attribute, since it overrides everything.

BUG=538250

Review URL: https://codereview.chromium.org/1383863002

Cr-Commit-Position: refs/heads/master@{#351883}
diff --git a/components/autofill_strings.grdp b/components/autofill_strings.grdp
index 916f805d..9f36e10 100644
--- a/components/autofill_strings.grdp
+++ b/components/autofill_strings.grdp
@@ -103,12 +103,13 @@
     Country
   </message>
 
-  <message name="IDS_AUTOFILL_SHOW_PREDICTIONS_TITLE" desc="The title for form elements when annotated with Autofill predictions.">
-    heuristic type: <ph name="HEURISTIC_TYPE">$1<ex>NAME_FIRST</ex></ph>
+  <message translateable="false" name="IDS_AUTOFILL_SHOW_PREDICTIONS_TITLE" desc="The title for form elements when annotated with Autofill predictions.">
+    overall type: <ph name="OVERALL_TYPE">$1<ex>NAME_FIRST</ex></ph>
     server type: <ph name="SERVER_TYPE">$2<ex>NAME_FIRST</ex></ph>
-    field signature: <ph name="FIELD_SIGNATURE">$3<ex>12345678</ex></ph>
-    form signature: <ph name="FORM_SIGNATURE">$4<ex>1234567812345678</ex></ph>
-    experiment id: "<ph name="EXPERIMENT_ID">$5<ex>ar1</ex></ph>"
+    heuristic type: <ph name="HEURISTIC_TYPE">$3<ex>NAME_FIRST</ex></ph>
+    field signature: <ph name="FIELD_SIGNATURE">$4<ex>12345678</ex></ph>
+    form signature: <ph name="FORM_SIGNATURE">$5<ex>1234567812345678</ex></ph>
+    experiment id: "<ph name="EXPERIMENT_ID">$6<ex>ar1</ex></ph>"
   </message>
 
   <!-- Autofill dialog: legal documents -->