[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 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: Ifbf77657a3b9c22f09c8f4628cf8fa0e8ab844ae