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

Change-Id: I07123a60795494168ccf7c2d7a0ae29ad352d30c