[automerger skipped] Merge "Fix exception in expandSplitContainerIfNeeded"...

[automerger skipped] Merge "Fix exception in expandSplitContainerIfNeeded" into tm-dev am: 5a0f8768 am: e53c8761 am: 20bbdaec -s ours

am skip reason: Merged-In Id8d122f7d95d1c6a3574b02ddd2b6afbc548f853 with SHA-1 bd2723cf is already in history

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



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