Merge "Used carrier specific id to fetch APNs" am: fe435b65e4

Original change: https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/1880189

Change-Id: Ie7a7b659a8c92b28f273674cb5391394f57867b7