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

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

Change-Id: I4eb06d91fa7413db5260823b73ad6c843d3f22ab