[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: 61e1882e -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7281c69517637e94b73e92103ee7acb4182cab9f