Merge "Fix unexpected IME switcher dialog hidden" into tm-dev am: 44151548 am: 5a7f0862

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



Change-Id: I8cdd9629d30e6fb3a254b777f78d4b9f5ea5fe46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>