Merge "Merge "Revert "Revert "Remove IME surface when occured in multi-window...

Merge "Merge "Revert "Revert "Remove IME surface when occured in multi-window mode""" into rvc-dev am: 8ec4d3a3 am: ebdc01a8" into rvc-d1-dev-plus-aosp am: 55b51221 am: d165bed5

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

Change-Id: I1d12c86ba5f4a20e15ef59f4230574557258cb22