Merge "Carrier ID table rollout latest_carrier_list_rollout_20200318" am: 1fc9a4694f am: 60da23eb9c

Change-Id: I05cce485509b708c2e944c9c8518d84651c3d8e8