Merge "Fix death recipient leakage of WindowTokenClient" into tm-dev am: 6cc80430 am: 816d5773 am: f61f7755 am: 747a8fba

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



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