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

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

Change-Id: I91a2697307ec737d11d385e6bd6f6ce47e86ec2f