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

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

Change-Id: I1b415d47541172de2d39e1cbbbfc701fdbcac1d0