am b7dda6d3: am b94a7fb3: Merge "Fix ConcurrentModificationException in TextServicesManagerService" into ics-mr1

* commit 'b7dda6d34b9dad2cd3094125b92a1503a9befa7c':
  Fix ConcurrentModificationException in TextServicesManagerService