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

Change-Id: I74ef63d3b1a8da886fca3a43e4276827a3e9e359