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

Change-Id: I8f82a752c12dc91e8126d2ee923a560d6de2dd8a