[Contextual Search] Exclude suppressed taps from aggregate suppression heuristics logging

chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/TapSuppressionHeuristics.java

Index: chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/TapSuppressionHeuristics.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/TapSuppressionHeuristics.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/TapSuppressionHeuristics.java
index 1e8030cfdfd61e9b6d006244cc0ea7c3c8964142..5acf44b27cd1c3310f9402e9ea82b28b246173da 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/TapSuppressionHeuristics.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/TapSuppressionHeuristics.java
@@ -29,7 +29,7 @@ public class TapSuppressionHeuristics extends ContextualSearchHeuristics {
                 new NearTopTapSuppression(selectionController, y);
         mHeuristics.add(tapNearTopSuppression);
         BarOverlapTapSuppression barOverlapTapSuppression =
-                new BarOverlapTapSuppression(selectionController, x, y);
+                new BarOverlapTapSuppression(selectionController, y);
         mHeuristics.add(barOverlapTapSuppression);
         // General Tap Suppression and Tap Twice.
         TapSuppression tapSuppression =
@@ -66,7 +66,7 @@ public class TapSuppressionHeuristics extends ContextualSearchHeuristics {
      */
     boolean shouldSuppressTap() {
         for (ContextualSearchHeuristic heuristic : mHeuristics) {
-            if (heuristic.isConditionSatisfied()) return true;
+            if (heuristic.isConditionSatisfiedAndEnabled()) return true;
         }
         return false;
     }