Merge "Carrier ID table rollout all_sdk_carrier_list_Rollout_20200709" am: f1eca72231 am: 6d84836461 am: 301afc5fa6

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

Change-Id: I59913003cd4d70ca4e18b142d3f74e2428e8e159