[automerger skipped] Merge "Fix IME flickering when swiping out to home" into sc-dev am: 933d70b498 -s ours am: 5f0c3dbcfb -s ours

am skip reason: Merged-In I044257b5ac0d92dd06dae8eba996ea0ac6f1e659 with SHA-1 807094a3e9 is already in history

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

Change-Id: I6fe44d3885570b8cd66b83ee76c2759f55fe4bd2