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 am: 848f9a3b

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



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