[automerger skipped] Merge "[DO NOT MERGE] Revert "Fix flickering when...

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

am skip reason: subject contains skip directive

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

Change-Id: I923f916d676e464b5fd428b84e1d6ecdf964559f