Merge "Carrier ID table rollout latest_carrier_list_rollout_20210601" am: 43a0e3d99d am: 81837dcb87

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

Change-Id: I815b9e03a614fc7a2c47592fe34e9a459fc437cb