Merge "Only add one starting window for a task when unlock." into sc-dev am: d79399ba

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

Change-Id: I0e04138a4b0684da331328e8079886026b42656f