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

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



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