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

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

Change-Id: I254c3b562f7e24b730ccd3cf69935fe70bc280f4