Merge "Carrier ID table rollout latest_carrier_list_rollout_20200415" am: 17350badb0 am: 5caf5d6113 am: 1c217b5e40

Change-Id: Ia481d4ea12633fb09cbd434e0447bd573da17566