Merge "Fix an edge case in IMS#switchInputMethod()" into udc-qpr-dev am: 880d3fb052 am: 542f0a80f2

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

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