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

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

Change-Id: Ib0997ba0536066b10695759d032653bf6a910a0b