Merge "gsm: Show localized SPN only when it matches system locale (2/2)" into gingerbread