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

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

Change-Id: I2abdf5fb2909d7163b550f54227dc5c4f085559f