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

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

Change-Id: Iba3d9648062e25139f5fcda861f42a19ac1f93b5