Merge "Carrier ID table rollout all_sdk_carrier_list_Rollout_20200813" am: 656317e416 am: 96e606164d am: cb3921b730 am: 05a5035d49 am: b603aca6cf

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

Change-Id: I70e412a882b0a73f62b676a7b4fcaac7fc6a37d1