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

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

Change-Id: Ib8a21082aa80b188ed8b28c5073b18bd37ea4c5a