Merge "Merge "Revert "Revert "Remove IME surface when occured in multi-window mode""" into rvc-dev am: 8ec4d3a33f am: b589824526 am: 1be0abe801" into rvc-qpr-dev-plus-aosp am: b7cb446ed8

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

Change-Id: Ibcba73456d15f6ac8cd282e75860157504972189