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

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

Change-Id: I9d17140c2245cd41731b963c94bef3c17311b191