[automerger skipped] Merge "Carrier ID table rollout latest_carrier_list_rollout_20210601" into sc-dev am: b02c343c55 -s ours

am skip reason: Merged-In Ia4b3f8244af8e721bd5a89c1ceda37a3ccac70e9 with SHA-1 d4b5a11ed8 is already in history

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

Change-Id: I3f53a0f795643afa70debcd4cab6bfa09897a705