am c047f60d: Merge "Fix issue #5445666: bunch of com.android.server.TextServicesManagerService crashes" into ics-mr0

* commit 'c047f60db277252f8921b88c82df1a8812afb169':
  Fix issue #5445666: bunch of com.android.server.TextServicesManagerService crashes