Merge "Add back de-flake workaround" into pi-dev
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testinfrastructure/DrawActivity.java b/tests/tests/uirendering/src/android/uirendering/cts/testinfrastructure/DrawActivity.java
index 54ce087..b8ba73b 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/testinfrastructure/DrawActivity.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testinfrastructure/DrawActivity.java
@@ -189,8 +189,16 @@
     }
 
     private class DrawCounterListener implements ViewTreeObserver.OnDrawListener {
+        private static final int DEBUG_REQUIRE_EXTRA_FRAMES = 1;
+        private int mDrawCount = 0;
+
         @Override
         public void onDraw() {
+            if (++mDrawCount <= DEBUG_REQUIRE_EXTRA_FRAMES) {
+                mView.postInvalidate();
+                return;
+            }
+
             long vsyncMillis = mView.getDrawingTime();
 
             mView.post(() -> mView.getViewTreeObserver().removeOnDrawListener(this));