Merge "Carrier ID table rollout latest_carrier_list_rollout_20200310" am: 48439c2739

Change-Id: Ic486c1ddd5691ed4d409e087ff68326b29a70402