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

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



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