[automerger skipped] Merge "Fix flickering when switched to the task without...

[automerger skipped] Merge "Fix flickering when switched to the task without IME shown" into sc-dev am: 7f95e16a am: 85553d02 am: ed87bc28 -s ours

am skip reason: Merged-In Ib3a1eacedd3763bcf1e6eed82e7efdf01c50b204 with SHA-1 7d9eb2b6 is already in history

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

Change-Id: Iaaf83201bb9e040d5988fa1054ba8a966993cc70