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

am skip reason: subject contains skip directive

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

Change-Id: Iecd58899958c6a83c41af0e036c1182a034dfd5d