Simplify some package update logic around restoring archived/unarchived shortcuts

 - also avoids race condition where unarchived shortcut is not pinned in shortcut service after restore, and then marked as broken

Bug: 375414891
Test: Launcher B&R w/ archiving
Flag: com.android.launcher3.restore_archived_shortcuts
Change-Id: I2b5331117be93d66e4acbded49b65cd5ce9f8f83