Without brought hady: Umrah ihram → tawaf and saʿi → shaving/trimming → release → Hajj ihram on 8 Dhu al-Hijjah.
With brought hady: Umrah ihram and offering → tawaf and saʿi → remain in ihram → add Hajj → shave on 10 Dhu al-Hijjah.
The distinguishing issue is the interim release, not whether the person has an obligation connected with Hajj and Umrah.