Merge "Carrier ID table rollout latest_carrier_list_rollout_20210518" into sc-dev am: 7239d2ffc5

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

Change-Id: Ifa958a431bf742ea617dcc46cb126bdfbe2633ca