Merge "carrier id APNs duplicates in restore" am: 63964f851e am: d7593a325d am: 3bdc8ccbf3

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

Change-Id: I9602e47cd07fbae9a0ba487776e728493d313f68