Make sure internal lists of AccountTypeManager aren't modified.

Change-Id: Iab3d31db52546dbfcf9f9b0cc6b8152ef48a15fe
String improvements.

Change-Id: I6d5ed4c5a983e821f32a0655afe820c5b249e432
Merge "String improvements." into cm-11.0
Merge "Make sure internal lists of AccountTypeManager aren't modified." into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into HEAD