Merge "Fix death recipient leakage of WindowTokenClient" into tm-dev am: 6cc804305d am: 811a42d6dd

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

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