am be96408b: (Do not merge) Backport a fix for InputMethodManager.java

* commit 'be96408b801666bf196adb0eabff4839e51e63ed':
  (Do not merge) Backport a fix for InputMethodManager.java