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

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

Change-Id: Iaa3cb98db39b15c6913efdae834dea179662e326