Merge "Ensure task will be attached when starting activity from AppTask" into tm-dev am: 4479d98a

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



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