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: I3a774cb468e187ff32bfdba045606d8baaa0f17d