Merge "Unlink to death before removing the callback wrapper in...

Merge "Unlink to death before removing the callback wrapper in SmartspaceService/AppPredictionServic3e" into tm-dev am: 1ec2fe2e am: 6630d416

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18475472



Change-Id: I3ebc95a4ce1188a7c273c1032963aff743e61f63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>