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

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

Change-Id: I6383327b1f83f63c4703509e16e4c9a86d629fde