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

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



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