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

Change-Id: If2b918c9766b0441d726be6aa304d1133c207901