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

[automerger skipped] Merge "Switch back to sync IInputMethodManager" into sc-dev am: d5f9f653 am: 502bd5a4 -s ours

am skip reason: Merged-In Idea98bd36935a27d886ca337154112e7dd293080 with SHA-1 a78e1f51 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15177777

Change-Id: Id2494946136487af20ff5e7258312e9141170447