am 95d520f1: Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev

automerge: 8a536bb

* commit '8a536bb4e04b8a0e4f074c744321d352d5bf08b2':
  Fix NPE in moveSharedElementsToOverlay

core/java/android/app/ActivityTransitionCoordinator.java

@@ -798,7 +798,7 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver {
     }
 
     protected void moveSharedElementsToOverlay() {
-        if (!mWindow.getSharedElementsUseOverlay()) {
+        if (mWindow == null || !mWindow.getSharedElementsUseOverlay()) {
             return;
         }
         setSharedElementMatrices();