Merge "Carrier ID table rollout latest_carrier_list_rollout_20200114" am: 687e99ca39 am: f710301f26 am: 957ec78dde

Change-Id: I0952107b3a1d722609c9ee5c3a5733dfd445d6a1