Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev