[automerger skipped] Carrier ID table rollout all_sdk_carrier_list_Rollout_20200610 am: e6bb99df75 -s ours am: c6d016b345 -s ours

am skip reason: Change-Id Ieb482e6c5284731806acb1391857bcc1999b2f27 with SHA-1 a11bff98a3 is in history

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

Change-Id: I83de2a7b5ef94645ee88d6d1077fb22f63bb0f69