Merge "Carrier ID table rollout latest_carrier_list_rollout_20210601" into sc-dev am: b02c343c55

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

Change-Id: I44447cff4953ee55e41b676557fa1a364e0a9012