[Paint Preview] Enable subframe scroll click test

This test was flaking on P so I've just re-enabled it on everything
except P. This should get us a bit more coverage which is nice.

Bug: 1110939
Change-Id: I016d2bf0b16e81fe2e39a43f83a67963ce4bed6f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2626182Reviewed-by: Mehran Mahmoudi <mahmoudi@chromium.org>
Commit-Queue: Calder Kitagawa <ckitagawa@chromium.org>
Cr-Commit-Position: refs/heads/master@{#844130}

components/paint_preview/player/android/javatests/src/org/chromium/components/paintpreview/player/PaintPreviewPlayerTest.java

@@ -147,26 +147,26 @@ public class PaintPreviewPlayerTest extends DummyUiActivityTestCase {
 
     @Test
     @MediumTest
-    public void nestedLinkClickTest() throws Exception {
+    @DisableIf.Build(message = "Test is failing on Android P, see crbug.com/1110939.",
+            sdk_is_greater_than = VERSION_CODES.O_MR1, sdk_is_less_than = VERSION_CODES.Q)
+    public void
+    nestedLinkClickTest() throws Exception {
         initPlayerManager(true);
         final View playerHostView = mPlayerManager.getView();
         assertLinkUrl(playerHostView, 220, 220, TEST_IN_VIEWPORT_LINK_URL);
         assertLinkUrl(playerHostView, 300, 270, TEST_IN_VIEWPORT_LINK_URL);
 
-        // Temporarily commenting out as this is flaky on P.
-
-        // UiDevice device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
-        // int deviceHeight = device.getDisplayHeight();
-        // int statusBarHeight = statusBarHeight();
-        // int navigationBarHeight = navigationBarHeight();
-        // int padding = 20;
-        // int fromY = deviceHeight - navigationBarHeight - padding;
-        // int toY = statusBarHeight + padding;
-        // mLinkClickHandler.mUrl = null;
-        // device.swipe(300, fromY, 300, toY, 10);
+        UiDevice device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+        int deviceHeight = device.getDisplayHeight();
+        int statusBarHeight = statusBarHeight();
+        int navigationBarHeight = navigationBarHeight();
+        int padding = 20;
+        int fromY = deviceHeight - navigationBarHeight - padding;
+        int toY = statusBarHeight + padding;
+        mLinkClickHandler.mUrl = null;
+        device.swipe(300, fromY, 300, toY, 10);
 
-        // Manually click as assertLinkUrl() doesn't handle subframe scrolls well.
-        // assertLinkUrl(playerHostView, 200, 1500, TEST_OUT_OF_VIEWPORT_LINK_URL);
+        assertLinkUrl(playerHostView, 200, 1500, TEST_OUT_OF_VIEWPORT_LINK_URL);
     }
 
     @Test