Add the product check into shouldSkip in DisableIf

Review-Url: https://codereview.chromium.org/2168133003
Cr-Commit-Position: refs/heads/master@{#406977}

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());
                 }