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

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



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