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

Change-Id: I946b745ee3dc0c503c0d225b87c84208e1fbc150