Merge "Carrier ID table rollout latest_carrier_list_rollout_20201111" am: 2763e5ac19 am: a37f750080 am: bf2ce13387 am: 0d03dd2616

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

Change-Id: I5044dd258aba67900a75b18d5dce46851b223d25