Merge "Carrier ID table rollout latest_carrier_list_rollout_20200114" am: 687e99ca39 am: f710301f26

Change-Id: I01006cc956c5f2ae13dbd358b9370959d03043a8