Merge "Keeps the intercepted activity on the existing secondary container"...

Merge "Keeps the intercepted activity on the existing secondary container" into sc-v2-dev am: 484805fa

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

Change-Id: I838ea740b57884d22c72e751665c75fb8e8046a9