Merge "Carrier ID table rollout all_sdk_carrier_list_Rollout_20210414" am: 1ea3d46f1c am: ba53c8208f

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

Change-Id: I04c9a1ed87af702c8e4b0c0334f59ccfd284a892