Merge "Prevent the launching activity be reparented into embedded task" into...

Merge "Prevent the launching activity be reparented into embedded task" into sc-v2-dev am: faf3acad

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

Change-Id: I878299bdb80bf2880fd5505b8ce9427a44a8c0f0