[automerger skipped] Merge "Switch back to sync IInputMethodManager" into sc-dev am: d5f9f65390 am: 88605e7b2a -s ours
am skip reason: Merged-In Idea98bd36935a27d886ca337154112e7dd293080 with SHA-1 3e20e0ec37 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15177777
Change-Id: Ia6a61ce6481d390c4c4bf3cce6c6918cb3ec9970
This commit is contained in: