Merge "Carrier ID table rollout latest_carrier_list_for_prev_sdk_20200708" am: 34c72bfc46 am: bbddddc667

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

Change-Id: I3e97f1961ac2de9a2c28837cc040b2ccf93be90a