[Autofill] Remove unintended application of subtoken merge strategy

It is currently not the intention to run the subtoken merge strategy
but due to an additional or statement, this strategy is executed
although it is the intent to only run a token merge strategy when
the back of tokens are equivalent.

This change removes the wrong application.

Bug: 1158810
Change-Id: I08d68818fac1b6a7552f6aa744caca8eed512902
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2627315Reviewed-by: Christoph Schwering <schwering@google.com>
Commit-Queue: Matthias Körber <koerber@google.com>
Auto-Submit: Matthias Körber <koerber@google.com>
Cr-Commit-Position: refs/heads/master@{#842977}

components/autofill/core/browser/data_model/autofill_structured_address_component.h

@@ -67,8 +67,7 @@ enum MergeMode {
   kUseNewerIfDifferent = 1 << 5,
   // If the newer component contains one token more, apply a recursive strategy
   // to merge the tokens.
-  kRecursivelyMergeSingleTokenSubset =
-      1 << 6 | kRecursivelyMergeTokenEquivalentValues,
+  kRecursivelyMergeSingleTokenSubset = 1 << 6,
   // If one is a substring use the most recent one.
   kUseMostRecentSubstring = 1 << 7,
   // Merge the child nodes and reformat the node from its children after merge.