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

Change-Id: Ie557fb0221b607d636523ac83f251590c0759de5