Merge "Carrier ID table rollout latest_carrier_list_rollout_20201111" am: 2763e5ac19

Original change: https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/1496400

Change-Id: I4621ec140ac7d0135ab3980726d796aaf867c642