Merge "Carrier ID table rollout latest_carrier_list_rollout_20200415" am: 17350badb0 am: 5caf5d6113 am: 1c217b5e40 am: e76fe03c8f

Change-Id: I70e43cb41d564bbf44009554201315243a8e697b