Merge "Revert "Enable PackageManagerService snapshots"" into sc-dev