Merge "Carrier ID table rollout latest_carrier_list_rollout_20201201" am: c9d7e52f12

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

Change-Id: I93abc11c2bc0e3f27e3fec37024570e4cc923652