Merge "Carrier ID table rollout latest_carrier_list_rollout_20210428" am: 074dcd7b6b

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

Change-Id: I5fd9370e81e159bcf53f4568ac7ef0889a74f573