Merge "Migrate task intent/info to new task only if source task is empty" into...

Merge "Migrate task intent/info to new task only if source task is empty" into tm-dev am: df3e2162

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



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