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

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

Change-Id: I6c494be1fc1942621a8527083eb1946682114346