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

Change-Id: Id1e3587fa6510520a3c95ac99dfdfcd5cb7299f3