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

Change-Id: Ia19644ea1c4843401ea34acf18e2251d8cc835c8