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: I501b04315d1a72279e1a2d6ea194aaf02ca28e1e