Merge "Finish the primary container while secondary exited" into sc-v2-dev am: 4abf39e6da

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

Change-Id: Iae5949672b79ff288c3473e16a7412dc83808349