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

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

Change-Id: I7663699b60fedfc0b4350899788a48a0004c99a2