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

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

Change-Id: Ie517f5c3677d16067bdd72042d3be3885961cf8d