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

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

Change-Id: Id507747e2a88198a6a9f3f28369e7b4251a8e171