Merge "Carrier ID table rollout latest_carrier_list_rollout_20200121" am: 95c7a5267c am: 3313c2613e

Change-Id: I44217eadae989950fcb3708d4db4809d67cab505