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

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

Change-Id: Ib157b819b11177ab58075b20d2a2ade9a683ed3d