Merge "Carrier ID table rollout latest_carrier_list_rollout_20201209" am: 37572573bb am: 428600ad2d am: 58e6e11c7a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec3209f5ffa0eea4d4c7532327dfef79cdbe1c3f