Merge "When SIM Name save as empty string by user, save the default display...
Merge "When SIM Name save as empty string by user, save the default display name show SIM1/SIM2." am: 5f9928e6 am: 04013b0e
am: 8129c4ba
Change-Id: Id429ebd18974e99e022bd69946cb084450038dad