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

Merge "Merge "Fix stuck IME when IME dialog is focused" into rvc-dev am: a13d3491 am: bf2c10fe am: 42ac4982" into rvc-qpr-dev-plus-aosp am: 498a56c6

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

Change-Id: Ia37c40e706618f7c53c41ca1edb1fe9dc49d7776