Merge "Carrier ID table rollout latest_carrier_list_rollout_20200218" am: 69f8b412ae am: 79eb34dee1

Change-Id: I57d817fd98b9b0e108114027b4887576b146fb60