[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: 8f50e091 -s ours am: c7b73ebb -s ours

am skip reason: subject contains skip directive

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

Change-Id: I700248e2717b1743071259975764e797a756872b