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

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

Change-Id: Id4012c7f7f68a993c39b824e5590b713f33e7b95