Merge "Carrier ID table rollout latest_carrier_list_rollout_20200415" am: 17350badb0

Change-Id: I1b54287cdc29494ed03d5f60cc743ee55a83e79d