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

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

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