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

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

Change-Id: Ic06bff9850bd7084e80b7b32304e6819bb360843