[automerger skipped] Merge "Fix ANR when switching the app task but IME...

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

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

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

Change-Id: Id37aa957ae32e6b94f69a3dad43238596c9a5e5f