Merge "Carrier ID table rollout latest_carrier_list_rollout_20201201" am: c9d7e52f12 am: 20a261cc84

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

Change-Id: I961da3fd7c9e57baec7c35d034b039c25fd50d05