Merge "Fixed that wrong SIM phone number is displayed when setting RTL language" am: 2321967884 am: a0573b14e5
am: 84caf42b3e

Change-Id: I1fb37cb4e17c110b76ee2c226992b2f96f14fba0