Merge "[DO NOT MERGE] Revert "Fix flickering when switched to the task without IME shown"" into sc-dev am: c4c7d9be

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

Change-Id: I680a6fdfc9e09325138c9d2e968eb5900afcda84