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

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



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