Merge "Merge "Fix starting window isn't removed" into tm-dev am: ce3c4be4 am: f4d5e638" into tm-d1-dev-plus-aosp am: 63a2c2c9

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



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