Merge "Fix IME hanging around" into rvc-dev am: a7ef29df9e am: b56f104259

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

Change-Id: I32cdb838ec831886b1a3739855c333f553034efb