Merge "Carrier ID table rollout latest_carrier_list_rollout_20200209" am: ac8174681c am: 39a004f85a

Change-Id: I91e66dcc2c7c0c979b92803504523be4c2746d36