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

Change-Id: I819bd2e3f9d206f3f15ce18426600d5447918690