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

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

Change-Id: Id5d03be043c9b77a57ddfea0b1d733977ede1f1c