Merge "Merge "Fix IME flickering when swiping out to home" into sc-qpr1-dev...

Merge "Merge "Fix IME flickering when swiping out to home" into sc-qpr1-dev am: c300c9d7 am: 7c09504d" into sc-v2-dev-plus-aosp am: be88c729

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

Change-Id: Ifd454d286c990b2a6ae52dbf63f41fae2ea3f134