Merge "Revert "Remove IME surface when occured in multi-window mode"" into rvc-dev am: a840c1f3 am: 80708009 am: c2007599

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

Change-Id: I140e2b2190a124da3158994acfbd99856b05f313