Merge "Fixed issue that SIM name was not completely displayed in select dialog" am: 5d2590d55e
am: d0f348f01e

Change-Id: If66fdaaa5f014bff2ec53f992cb477238b94fa37