[automerger skipped] Merge "Add carriers/sim_apn_list/filtered/subId url to fetch APNs of current SIM" am: 5a5c2062f0 am: d64e459a7d
am: 71e17f3fe5  -s ours

Change-Id: Ie39f3b20dee7d59e2ce385538fbcfa73525bf204