Merge "Carrier ID table rollout latest_carrier_list_rollout_20200423" am: 01ce1bfd4b

Change-Id: I8f6f6cf631100f9eba458357fd67ddf3734148d6