Merge "Fix IME flickering when swiping out to home" into sc-dev am: 933d70b498

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

Change-Id: I02f781bfff5e8c344fdb0c41f015a114039f3c99