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

[automerger skipped] [DO NOT MERGE] Revert "Fix flickering when switched to the task without IME shown" am: 9eca14b7 am: a5fdb82d -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0be9a008fb9c91fd88c9f6f0b7319dc0095e3a95