Merge "Launch all activities into the same root task" into tm-qpr-dev am: a45c7f7d am: 74b22230

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



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