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

Change-Id: I0dcece4bb495f6fa8a3c589bf11dfbaefb40959c