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

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

Change-Id: I790f1f0df38b836f37b96de2a39087c2c8b1b126