Merge "Issue 128554259: Sim card name incorrect after user change system language." am: d838d617a6 am: 9ffe52b3b5 am: 21032c9d5a
am: 4d38dd9d69

Change-Id: Ib0140dce142110f478f2b1cb349f76f0c290dd15