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 am: 2c121cf2

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

Change-Id: Ia146e8b3d45702dee8d78acc03bb339654797022