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

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

Change-Id: Iab3e254fc162e61d01479c4087d775d5810ce58c