Merge "Fix starting window isn't removed" into tm-dev am: ce3c4be4 am: e0f7dd8f am: 156073c6

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



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