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

Change-Id: I0c8c1269837099eb7b33219554025d585604a2d3