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

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



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