Merge "Do not preserve window when window not added" into main am: 9c05e0e0d0 am: b0a999d0ab

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

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