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

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

Change-Id: I1833a5b5954fa4a54d0289383df4519c3d0bf9b9