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
am: 5f72b7a2
Change-Id: If6fd8ad43b55e7775931518a28cd75f7ce4ab1b0