Merge "Prevent potential NPE of checking task drawn for logger" into sc-dev

services/core/java/com/android/server/wm/ActivityMetricsLogger.java

@@ -780,7 +780,7 @@ class ActivityMetricsLogger {
             // window drawn event should report later to complete the transition. Otherwise all
             // activities in this task may be finished, invisible or drawn, so the transition event
             // should be cancelled.
-            if (t.forAllActivities(
+            if (t != null && t.forAllActivities(
                     a -> a.mVisibleRequested && !a.isReportedDrawn() && !a.finishing)) {
                 return;
             }