Merge "Update SplitContainer for non-finishing containers" into tm-dev am: 9040b7e2

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



Change-Id: I3c91a41b984de8eee766f41d064638b28f8eebc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>