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: f8ec8d32" into rvc-d1-dev-plus-aosp am: f9895c9b am: 3e64d6bc

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

Change-Id: I65b854f954fb57d0530696c9dcb02919c75d7819