Merge "Fix exception in expandSplitContainerIfNeeded" into tm-dev am: 5a0f8768

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



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