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

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

Change-Id: If1e0b5f4b4a52ec45c3ef1f04986d954ed447400