[automerger skipped] Fix window token leak on multi-display targets am: 0e21beee -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: I78151e620a6ab73858a922753803b2bf9284e7d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>