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

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

Change-Id: I56cce19f06aefe6f1b609edbbcd5cc12c6f206ac