[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 am: e708a7de -s ours am: 2b13f0df -s ours am: f6594d4d -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: Ie123f3fbce642d1841f71780af9c2a7b1d5d8f43