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

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



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