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

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

Change-Id: Ic8cb50f6f13a8eb004f637c54e4fe114e326bee7