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

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

Change-Id: I40f68dce586fc097ce79703a9f524d439e91dd84