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

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

Change-Id: I19e81cb246b7bdcb449e0da7d1826d15d5c8a74f