Merge "Restore split layout when wm-shell no longer controlling IME" into sc-dev am: 5a43b726d4

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

Change-Id: I7b0e10e1dab821e6e95086f3d7bf1665d2d3d62b