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

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

Change-Id: Ie130532ef5fd2032e49437f4d0aacc8e80f5f3b4