Merge "Fix descriptions for default SIM in global preferences" am: eeeb74a093
am: f87866ba9f

Change-Id: I93c5b77138ce7b23e27371a7be15f00e25b987e1