[automerger skipped] Merge "Fix window token leak on multi-display targets"...

[automerger skipped] Merge "Fix window token leak on multi-display targets" into android15-tests-dev am: 441f938a -s ours am: 7c08794f -s ours

am skip reason: Merged-In I5f207ddd09fab8c269db03d9a6dc09fb1d4cce92 with SHA-1 6a434c0a is already in history

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



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