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

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



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