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

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

Change-Id: I2d289c2d18ba2a0433da18d7d718276ea19970db