Merge "Fix issue with leaking death recipients" into tm-qpr-dev am: b1f85974 am: c5f19964

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



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