Merge changes from topic "presubmit-am-b5e39839c1434267a07590be6e0b1b91" into sc-v2-dev-plus-aosp

* changes:
  [automerge] Fix NPE 2p: 18179a8762
  Fix NPE

services/core/java/com/android/server/pm/PackageInstallerService.java

@@ -394,7 +394,10 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
                     // Their staging dirs will be removed too
                     PackageInstallerSession root = !session.hasParentSessionId()
                             ? session : mSessions.get(session.getParentSessionId());
-                    if (!root.isDestroyed()) {
+                    if (root == null) {
+                        Slog.e(TAG, "freeStageDirs: found an orphaned session: "
+                                + session.sessionId + " parent=" + session.getParentSessionId());
+                    } else if (!root.isDestroyed()) {
                         root.abandon();
                     }
                 } else {