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

Change-Id: I1cf95ff08d27bd68478928650a3d557f08bc0f7a