Merge "Fixing missing unlinktoDeath" into sc-dev am: eb0a14ad79

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14684233

Change-Id: I26a5b6d5a6464109bec3554c2d2caabe2c960013