Merge "Fix death recipient leakage of WindowTokenClient" into tm-dev am: 6cc80430 am: 811a42d6 am: d61bf517 am: 956e43ad

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



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