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

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

Change-Id: I7546dae95698aec759a8780d864da8b49f24c99d