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: I687223907b4ce6b7ac7e13f685a7a2f88d06f8c2