Merge "Fix flickering when switched to the task without IME shown" into sc-dev am: 7f95e16a0d

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

Change-Id: I32aaa41e4e7a9cbd657c8467d9e8f50f3c156f1b