Merge "Carrier ID table rollout latest_carrier_list_rollout_20200114"
am: 687e99ca39

Change-Id: I2a1b92c4dd87324b1c29ec79fdeb4e6d02184d66