Merge "Revert "Remove IME surface when occured in multi-window mode"" into rvc-dev am: a840c1f3 am: a447125c am: 09488c36

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

Change-Id: I30f4ea29956442210f0269a9d8c552a005a34914