Merge "Associate starting window with task once a TF is added" into tm-qpr-dev...

Merge "Associate starting window with task once a TF is added" into tm-qpr-dev am: e99311a4 am: 6e581904

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



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