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

Change-Id: Ia0e7a7fc127221bf33dfd79d37164533b4b854c9