[automerger skipped] Merge "Switch back to sync IInputMethodManager" into...

[automerger skipped] Merge "Switch back to sync IInputMethodManager" into sc-dev am: 4e944d46 am: cd4b57ab -s ours am: 23d5eb19 -s ours

am skip reason: Merged-In If16ac0de536d9089eb04f6e07b1ee47378124658 with SHA-1 9dde7014 is already in history

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

Change-Id: Id68cb83f3cc389ea20697bce2b059898828f0186