Merge "Remove StartingWindow or cancel the request to add StartingWindow after all activities have been drawn" into main am: 1330ec3337 am: b2c0d58c05

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

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