Merge "Only defer remove starting window if the collecting target below task"...

Merge "Only defer remove starting window if the collecting target below task" into udc-qpr-dev am: 19ae03e5 am: 71d325d5

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



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