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

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



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