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

Change-Id: Ie4e492062c0c1a91b36abce43fde3506ae2cbc60