Merge "Merge "Revert "Revert "Remove IME surface when occured in multi-window mode""" into rvc-dev am: 8ec4d3a33f am: ebdc01a8f3" into rvc-d1-dev-plus-aosp am: 55b512217b

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

Change-Id: Ic25916b9f7749568325b92e9385b8c6864e98806