Merge "Carrier ID table rollout latest_carrier_list_rollout_20210518" am: b899b5db1a

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

Change-Id: Iad6e6a03ed105946c721062d4c43a786ddd52b62