Merge "Carrier ID table rollout latest_carrier_list_rollout_20200408" am: 5dfdfd36ef am: 2ba7f4aa41

Change-Id: I086799f15fb386cd725abbeaef66a4bcf39acf63