[automerger skipped] Merge "Fix ANR when switching the app task but IME selection dialog focused" into sc-dev am: 1181f3e9 am: 29bec48f -s ours

am skip reason: Merged-In Iae3dd713b1e980067d28debea4e0a03707aa7938 with SHA-1 bd868b66 is already in history

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

Change-Id: I67f8948336485d0c8d2fba52aec5165d1520d192