[EoC] Don't record NTP UMA for suggestions navigations

Don't record a histogram entry for NewTabPage.ActionAndroid2 or the
Suggestions.Card.Tapped user action when a contextual suggestion
is clicked.

BUG=870424

Change-Id: I7d10c1b00628c83f4dbde2a4353707a483722656
Reviewed-on: https://chromium-review.googlesource.com/1162319Reviewed-by: Filip Gorski <fgorski@chromium.org>
Commit-Queue: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#580641}

chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetArticleViewHolder.java

@@ -82,7 +82,7 @@ public class SnippetArticleViewHolder extends CardViewHolder {
 
     @Override
     public void onCardTapped() {
-        SuggestionsMetrics.recordCardTapped();
+        if (!mArticle.isContextual()) SuggestionsMetrics.recordCardTapped();
         int windowDisposition = WindowOpenDisposition.CURRENT_TAB;
         mUiDelegate.getEventReporter().onSuggestionOpened(
                 mArticle, windowDisposition, mUiDelegate.getSuggestionsRanker());

chrome/android/java/src/org/chromium/chrome/browser/suggestions/SuggestionsNavigationDelegateImpl.java

@@ -105,7 +105,9 @@ public class SuggestionsNavigationDelegateImpl implements SuggestionsNavigationD
 
     @Override
     public void openSnippet(final int windowOpenDisposition, final SnippetArticle article) {
-        NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_SNIPPET);
+        if (!article.isContextual()) {
+            NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_SNIPPET);
+        }
 
         if (article.isAssetDownload()) {
             assert windowOpenDisposition == WindowOpenDisposition.CURRENT_TAB
@@ -157,7 +159,9 @@ public class SuggestionsNavigationDelegateImpl implements SuggestionsNavigationD
         }
 
         Tab loadingTab = openUrl(windowOpenDisposition, loadUrlParams);
-        if (loadingTab != null) SuggestionsMetrics.recordVisit(loadingTab, article);
+        if (loadingTab != null && !article.isContextual()) {
+            SuggestionsMetrics.recordVisit(loadingTab, article);
+        }
     }
 
     private void openDownloadSuggestion(