[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: 17dedf95 -s ours

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

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

Change-Id: Id7936789c90745793b8cbc3062c7ba0cde2af4da