Merge "Fix a status bar NPE in InputMethodManagerService" into nyc-dev am: 3b67c0b
am: 7f4c096

* commit '7f4c096c98ffd3320a15c2224dbaa570ec4c114b':
  Fix a status bar NPE in InputMethodManagerService