Merge "Unlink death recipient which references to DisplayContent" into tm-qpr-dev am: 8bfc996c

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



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