Merge "Fix dialog exit animation" into sc-v2-dev am: 2e314e8639

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17136846

Change-Id: If3b8b6e57fab9b97cd5bd875109b98dff4f70f10

core/java/android/view/ViewRootImpl.java

@@ -3390,6 +3390,12 @@ public final class ViewRootImpl implements ViewParent,
                     mReportNextDraw = false;
                     pendingDrawFinished();
                 }
+
+                // Make sure the consumer is not waiting if the view root was just made invisible.
+                if (mBLASTDrawConsumer != null) {
+                    mBLASTDrawConsumer.accept(null);
+                    mBLASTDrawConsumer = null;
+                }
             }
         }