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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3fdc0edc3c548cbdaecca9d2327178d11694df06