Merge "Carrier ID table rollout latest_carrier_list_rollout_20200203" am: 854e5aa987 am: b8f650c423

Change-Id: I05918b5f1ca531b16cd19a1c49617bac97dc0ffa