Merge "Run appsFilter.systemReady() last"

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

@@ -21645,8 +21645,6 @@ public class PackageManagerService extends IPackageManager.Stub
                         .getUriFor(Secure.INSTANT_APPS_ENABLED), false, co, UserHandle.USER_ALL);
         co.onChange(true);
 
-        mAppsFilter.onSystemReady();
-
         // Disable any carrier apps. We do this very early in boot to prevent the apps from being
         // disabled after already being started.
         CarrierAppUtils.disableCarrierAppsUntilPrivileged(
@@ -21795,6 +21793,9 @@ public class PackageManagerService extends IPackageManager.Stub
         mInstallerService.restoreAndApplyStagedSessionIfNeeded();
 
         mExistingPackages = null;
+
+        // We'll do this last as it builds its cache while holding mLock via callback.
+        mAppsFilter.onSystemReady();
     }
 
     public void waitForAppDataPrepared() {