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

Change-Id: I1ce7fc6f311f9462f1f505ef5387b2416728c794