[automerger skipped] Merge "Fix exception in expandSplitContainerIfNeeded" into tm-dev am: 5a0f8768a7 am: e53c8761b2 -s ours am: f715efcac1 -s ours
am skip reason: Merged-In Id8d122f7d95d1c6a3574b02ddd2b6afbc548f853 with SHA-1 bd2723cf6e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18886475
Change-Id: Ia5f3850d924601164704d458ab65e45fa8c9161a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: