Merge "Fix stuck IME when IME dialog is focused" into rvc-dev am: a13d3491 am: f8ec8d32

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

Change-Id: Ifc26090ff315e749742b02820d9583979b20b560