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

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

Change-Id: I5b5632fd2fe6522880d82200dc0ae2de946e50ed