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

Merge "Update SplitContainer for non-finishing containers" into tm-dev am: 9040b7e2 am: 5c969c07 am: 7bd15e0a am: 9b29d46e

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



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