[automerger skipped] Merge "Restore split layout when wm-shell no longer...

[automerger skipped] Merge "Restore split layout when wm-shell no longer controlling IME" into sc-dev am: 5a43b726 am: e0990655 -s ours

am skip reason: Merged-In I5caeeff9406d21e21c8a82c0078cbfae36bd4063 with SHA-1 988fa9d8 is already in history

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

Change-Id: I5b910f0bbef64bfb2cd4aa5d5e6f99f02338f57e