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

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

Change-Id: I783e42924ae0ba84dfbc270ccaba89a803778b41