Merge "Carrier ID table rollout all_sdk_carrier_list_Rollout_20200709" am: f1eca72231

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

Change-Id: I3098bd1befd5a2dcb049bc6d9988002fe51e1fd0