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

Change-Id: Icdd45ed68cc8254ac59dd1e91f25e72984074fe5