Added extra logic for selecting APNs for a subscription

A carrier can have multiple mcc/mnc attributed to it, but
have the same carrier_id.
In case APNs that match mcc/mnc/mvno are found in database,
discard any APNs that match carrier_id, but do not match
mcc/mnc.
In case there is no APN matching mcc/mnc/mvno, add all
APNs that match carrier_id.

Test: Add APNs for Telia SE 240 01 and 240 05 with carrier_id 1690 and check in APN Settings.
Bug: 197470879
Change-Id: Ia7528aea598c86f9a51d2de5360936f46bfdbc9c
2 files changed