Merge "Finish existing secondary containers when starting to side" into...

Merge "Finish existing secondary containers when starting to side" into sc-v2-dev am: 260fa38f am: daddd679

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

Change-Id: I1b15c35ab779258c33df8b1c6a5378ea368a4ed1