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

Change-Id: I6889a75a3812c445286ed4b1f9282fc5fde1548c