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

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

Change-Id: I32e1cd7c4575f3ae2e8510717a85b067b5f99992