Merge "Limiting activity embedding to the activities of the same app" into sc-v2-dev am: 9fbadb5a

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

Change-Id: If662e6ebda097b3df7056c67c47c75e2a2dfeda5