Merge "Carrier ID table rollout all_sdk_carrier_list_Rollout_20200813" am: 656317e416 am: 96e606164d

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

Change-Id: I690cba8c63bf65bfb6c740a1bc52eb97f38ff503