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 am: 77be4e31 am: 8f60ed56

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



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