Merge "Fix SearchUiService memory leak by removing DeathRecipient from CallbackWrapper" into tm-dev am: ea56fc68 am: f4aa226b am: 2aeda3a3

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



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