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

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

Change-Id: Id21c5715f9504c5c8878ea603a15fb0741fd33ed