am 15edaceb: (-s ours) am 913a8925: DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread

Merge commit '15edaceb2d46f18c32fb20a3d3dae556c1078bb6'

* commit '15edaceb2d46f18c32fb20a3d3dae556c1078bb6':
  DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread