Merge "Merge "ActivityEmbedding: launch into the same side container" into...

Merge "Merge "ActivityEmbedding: launch into the same side container" into sc-v2-dev am: 53c2f64d" into sc-v2-dev-plus-aosp am: a49b347f

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

Change-Id: If318f2d32770299d59580f6b95c6b179ac7cd283