Merge "Fix window token leak on multi-display targets" into main am: a08c10a5 am: 7165f50d

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



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