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

* commit 'b94a7fb3d7483e8b47e4f0229fc7abff10a6572d':
  Fix ConcurrentModificationException in TextServicesManagerService