Add the product check into shouldSkip in DisableIf

base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java

Index: base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java
diff --git a/base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java b/base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java
index 38eb16ada8347d3f83d324f6f1dfc95ce1563e73..ecb0c1f78e6f4886f3c6f6b777f2c3b2d865e9a7 100644
--- a/base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java
@@ -28,7 +28,7 @@ public class DisableIfSkipCheck extends SkipCheck {
         if (method == null) return true;
 
         for (DisableIf.Build v : getAnnotations(method, DisableIf.Build.class)) {
-            if (abi(v) && hardware(v) && sdk(v)) {
+            if (abi(v) && hardware(v) && product(v) && sdk(v)) {
                 if (!v.message().isEmpty()) {
                     Log.i(TAG, "%s is disabled: %s", testCase.toString(), v.message());
                 }