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: I4c81aff01f47c0fecc03ee34a387139e476c6453
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>