[automerger skipped] Merge "Fix IME flickering when swiping out to home" into...

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

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

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

Change-Id: I43873e466d05a6a5fe1dec9e72b423025742eb18