Merge pull request #18528 from jaoo/998914

Bug 998914 - [Settings] Cannot preselect the APN correctly if there are several APNs with the same carrier name (follow-up bug 991628). r=arthurcc