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

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



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