Merge "Fix EmbeddedWindow leaked when client binder death" into main am: f9c9cb7d5d am: 3e56363522

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

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