Merge "Carrier ID table rollout latest_carrier_list_rollout_20210428" am: 074dcd7b6b am: ef95effde8

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

Change-Id: I996ef115ffd0929333235e9d6c1d8e49dc58b9a4