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

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

Change-Id: Ib768ee79d0de4ff56123a225d81e548ee058ae64