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

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

Change-Id: I22f52a2e288c5127b95d5f47346b1a6622f1eef3